Free the data of the row before overwriting it. (#307490, Kjartan Maraas)

2005-06-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c (model_update_current_folder):
	Free the data of the row before overwriting it.  (#307490,
	Kjartan Maraas)

diff --git a/ChangeLog b/ChangeLog
index 2179cb56201beb5a7345dcf543402682b024054a..658a87aa1c3ebdecb121cee5ed63e64df179eb2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+       Free the data of the row before overwriting it.  (#307490,
+       Kjartan Maraas)
+
 2005-06-13  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gtk/gtkcalendar.c: (calendar_paint_arrow): Don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2179cb56201beb5a7345dcf543402682b024054a..658a87aa1c3ebdecb121cee5ed63e64df179eb2e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+       Free the data of the row before overwriting it.  (#307490,
+       Kjartan Maraas)
+
 2005-06-13  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gtk/gtkcalendar.c: (calendar_paint_arrow): Don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2179cb56201beb5a7345dcf543402682b024054a..658a87aa1c3ebdecb121cee5ed63e64df179eb2e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (model_update_current_folder): 
+       Free the data of the row before overwriting it.  (#307490,
+       Kjartan Maraas)
+
 2005-06-13  Kjartan Maraas  <kmaraas@gnome.org>
 
        * gtk/gtkcalendar.c: (calendar_paint_arrow): Don't

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 1b443462eccafddb91f767b3c172fa684e8fa847..7c9a44948ac4a37678b3158fb68b1d88e66c0693 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1477,7 +1477,10 @@ model_update_current_folder (GtkFileChooserButton *button,
       button->priv->has_current_folder = TRUE;
     }
   else
-    gtk_tree_model_iter_nth_child (button->priv->model, &iter, NULL, pos);
+    {
+      gtk_tree_model_iter_nth_child (button->priv->model, &iter, NULL, pos);
+      model_free_row_data (button, &iter);
+    }
 
   pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
                                        GTK_WIDGET (button),